Skip to content

Correctly mark the span of captured arguments in format_args!() #94030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 17, 2022
Merged

Correctly mark the span of captured arguments in format_args!() #94030

merged 1 commit into from
Feb 17, 2022

Conversation

ChayimFriedman2
Copy link
Contributor

It should not include the braces, or misspelling suggestions will be wrong.

Fixes #94010.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 15, 2022
@rust-highfive
Copy link
Contributor

r? @petrochenkov

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 15, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ChayimFriedman2 ChayimFriedman2 marked this pull request as draft February 15, 2022 21:59
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ChayimFriedman2 ChayimFriedman2 force-pushed the issue-94010 branch 2 times, most recently from 421bf38 to b771f4f Compare February 16, 2022 01:29
@ChayimFriedman2 ChayimFriedman2 marked this pull request as ready for review February 16, 2022 02:12
petrochenkov
petrochenkov reviewed Feb 16, 2022
View reviewed changes
@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2022
@ChayimFriedman2
Correctly mark the span of captured arguments in format_args!()
91adb6c 
It should only include the identifier, or misspelling suggestions will be wrong.
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
  IMAGE: x86_64-gnu-tools
##[endgroup]
From https://github.com/rust-lang/rust
 * branch              master     -> FETCH_HEAD
Searching for toolstate changes between a240ccd81c74c105b6f5fe84c46f8d36edb7e306 and 2f2f82eebf50165472d8b7d7c89efbf7f71749b4
Clippy or rustfmt subtrees were updated
##[group]Run src/ci/scripts/verify-channel.sh
src/ci/scripts/verify-channel.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
---
Verifying status of rls...
Verifying status of miri...
Verifying status of embedded-book...
Cloning into 'rust-toolstate'...
error: Tool `rls` has regressed from test-pass to test-fail during beta week.

@ChayimFriedman2
Copy link
Contributor Author

A supurious fail?

@petrochenkov
Copy link
Contributor

The failure looks spurious to me.
@bors r+

@bors
Copy link
Collaborator

bors commented Feb 16, 2022

📌 Commit 91adb6c has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 16, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 16, 2022
@matthiaskrgr
Rollup merge of rust-lang#94030 - ChayimFriedman2:issue-94010, r=petr…
a8c7dd4 
…ochenkov

Correctly mark the span of captured arguments in `format_args!()`

It should not include the braces, or misspelling suggestions will be wrong.

Fixes rust-lang#94010.
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 16, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 17, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 17, 2022
@bors
Auto merge of rust-lang#94072 - matthiaskrgr:rollup-7uu2286, r=matthi…
582b696 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#89869 (Add documentation to more `From::from` implementations.)
 - rust-lang#93479 (Use `optflag` for `--report-time`)
 - rust-lang#93693 (Suggest deriving required supertraits)
 - rust-lang#93981 (Fix suggestion to slice if scurtinee is a reference to `Result` or `Option`)
 - rust-lang#93996 (Do not suggest "is a function" for free variables)
 - rust-lang#94030 (Correctly mark the span of captured arguments in `format_args!()`)
 - rust-lang#94031 ([diagnostics] Add mentions to `Copy` types being valid for `union` fields)
 - rust-lang#94064 (Update dist-x86_64-musl to Ubuntu 20.04)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a1a750b into rust-lang:master Feb 17, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 17, 2022
@ChayimFriedman2 ChayimFriedman2 deleted the issue-94010 branch February 17, 2022 14:07
flip1995 pushed a commit to flip1995/rust that referenced this pull request Feb 24, 2022
@matthiaskrgr
Rollup merge of rust-lang#94030 - ChayimFriedman2:issue-94010, r=petr…
ecf3165 
…ochenkov

Correctly mark the span of captured arguments in `format_args!()`

It should not include the braces, or misspelling suggestions will be wrong.

Fixes rust-lang#94010.
@Alexendoo Alexendoo mentioned this pull request Jul 24, 2022
Merged
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jul 24, 2022
@bors
Auto merge of #9237 - Alexendoo:useless-format-spans, r=Jarcho
20e4204 
Fix `useless_format` spans for `format!("{foo}")`

Fixes #9234

changelog: [`useless_format`]: Fix spans for `format!("{foo}")`

rust-lang/rust#94030 made our workaround unneeded, but by coincidence our test still passed [because `Span::new()` swaps `hi` & `lo` if needed](https://github.com/rust-lang/rust/blob/c32dcbba187d1ee0dbe92dc152cb9c2f3f42900c/compiler/rustc_span/src/span_encoding.rs#L86-L88). So with a single character variable like `format!("{x}")` it still worked
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.

bad span for suggestion in format string
6 participants
@ChayimFriedman2 @rust-highfive @rust-log-analyzer @petrochenkov @bors @rustbot